be0092
@@ -41,6 +41,7 @@
import com.mongodb.DBRef;
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Patryk Wasik
  */
 public class QueryMapper {
 
@@ -267,6 +268,16 @@
public class QueryMapper {
 			return result;
 		}
 
+		if (property.isMap()) {
+			BasicDBObject result = new BasicDBObject();
+			DBObject dbObject = (DBObject) source;
+			for (String key : dbObject.keySet()) {
+				Object o = dbObject.get(key);
+				result.put(key, o instanceof DBRef ? o : converter.toDBRef(o, property));
+			}
+			return result;
+		}
+
 		return source == null || source instanceof DBRef ? source : converter.toDBRef(source, property);
 	}
 
